Fixing the test. Quite ugly but should be OK for now.