Tinkered with tests and made them more readable