reorganize and check bundled tests back in