remove unneeded tests, add test support for APC