cleaner tests, thanks Alex!