cleaned up tests to use Should matchers