Fixes tests to match new method signatures