Remove duplicate mock classes; updated version of annotation and transaction dependencies