fixes some failing tests and mistake in new controller