Tests forAp1 updated.
Class Ap1 updated.