Added unit tests - 1