Test: Added more assertions