Smoke fixes

and removed the test objects in anticipation of final release.