Improved test clarity

Just some on-going work to improve the tests.