Another set of changes to the test suite (even though the tests are broken still) and the AI