Also rename teh tests