Added tests and changed navigation from addActivity