Reworked the unit tests to match the method signatures