Write more tests and add @covers tags