Fix tests for new paradigm