Many misc test changes through RapidApp 0.99012

Note: this app is currently being used mostly for RapidApp
testing/development, so there is currently some cruft for that
purpose...