- removed methods
 - added unit tests