fixing comment for A5, adding tests