Add more tests and support ACCREC