Cleaner tests and less files.