renamed and fixed unit tests