Updated for new test