Add more assertions and tests