Updating tests to correct naming. Using should matchers intstead of JUnit style asserts.