Renamed tests; started setup feature