More testers; fixed add and union