Updated to new test standards