More build script clean-up, adding testing plan.