update/cleanup test_analysis for testing with AWE service