Improve the tests

I'm trying to make the existing tests more meaningful and descriptive, and less bloated with stuff that does not directly support the test case.