Tests for 2 methods

Did an upstream merge and added tests for your 2 new methods.