Simplify ABCModel and ABCMethodTest