Code clean up and additional tests
Arrow clicks and more tests