Add ACP & hacks to test.