include tests in the app package
bring in changes learned from ox scale