Tests for 2 methods

adding the tests for your 2 feature methods.  Includes upstream commits.