Fix tests to allow for new fixture