Refactoring and more tests

Change @covers Class::Method to @covers Class
More tests