updated to work with new test generator functions