am d306055f: (-s ours) Moving a few testing classes to a separate package

* commit 'd306055f2d7750df08d9dfb9f630517e0b43f6eb':
  Moving a few testing classes to a separate package