Fixes for url builder tests
Test fixes
Test fixes
More test fixes
Updated build script to match newer approach.  Removed testapp (no longer needed)
Merge branch 'feature'
Removed test app