Testing: more tests for better coverage