Tidied up tests.
Fix
Fix
Improved readability.