fix testing; rename clear to cleaner