Add more @covers tags and test cleanup