Refactoring the Test App to better adhere to best practices