More tests, but I'm starting to see the point to them