More assertions and tests for better coverage