more tests, cleaner layout