Added one more method and fixed some unit tests