Removed some files and added more tests