Combine test_utils_.py with test_amo_utils.py (bug 1037132)
Merge pull request #2303 from mstriemer/combine-amo-utils-tests-1037132

Combine test_utils_.py with test_amo_utils.py (bug 1037132)