Removed temp files, added tests