Fix up assert messages
Added tests for asserts