removing comments in test setup, make setup order consistent