removing unused files, adding tests