consolidate and rename tests
1 file changed