Refactoring: Cleaning up App tests