Fixed more @covers errors
Fixed checkstyle error