Changes for version 1.0002

  • Make tests more resilient