Workaround to get the tests going until we can fix the scoping of the
tests