Added tests to prove the new method works