changed assert messages to match assertion, added unit tests for new asserts