more test setup and renaming