Fix to new test code