chore(app): Added fixes and test