updated to new test scheme