Clean up step definitions and modify app code so tests pass