Adjusted application helper and test.