Updated build script to match newer approach.  Removed testapp (no longer needed)