Coverage

Make 100% by removing unused methods and added missing tests for used methods.