More fixes, attempt to get the test to pass (more time?)