renamed files. fixed unit test