More test fiddling