Converted a test to new scheme