Remove superfluous methods and extend unit test coverage

Remove superfluous methods and extend unit test coverage #63