Start the app in the test helper to test it
Move helpers to test helper
Wait helpers should be a macro; Fix tests