updates to app and tests