More tests, cleaner tests