Added tests for ACTR and changed a few methods.