Cover more tests