Handle back button properly
Add more tests