bug fix, wa_tests complete