Removing some files and modifying test case