tests: Update to use the correct classes