Adding new tests and cleaning up files.