More test coverage, small changes to method call