Renamed test methods, fixed compile errors