Tests! Cleaned up a little and added method remove_cached_files.