Updated AA
Improved the test runner