adapt for new-style tests
Updating to new-style tests