Added unit tests #186