Bug 56559 - merge tests subpackage back

Summary: merge tests subpackage back