More asserts and tests