Back out test stuff, ready for Tollef to merge