Added tests for new methods