Added unit tests methods