Tests should be refactored

[samdark]

There are many assertions in a single test method which aren't clear. It makes sense to break these each assertion into its own method and name the method to describe what is asserted.