Removed unnecessary test files and added more tests