putting tests in order and renaming contexts