Fixing unit tests that were using an older API