Restore missing ACI tests after refactoring
Refactor ACI functonal tests to follow test suite conventions