APS & JTR: updated failing tests