convert more tests away from standard