refactored setUp for test_helpers
added ArgumentOrder
Merge remote-tracking branch 'origin/master'