test_app, mv spec dir under gem root and use dummy app instead
Merge remote branch 'upstream/master' Conflicts: test_app/Gemfile.lock