Adding a few more tests and updating the app to use a helper