Better and more tests