Even more tests for better coverage