Tidier and more tests