Update tests for new app copy and Settings cleanup

Addresses test failures enumerated in #1506