Added framework target. Converted to test bundles. Removed thrust