Added extra tests to prevent just returning what
the test expects.