Added some unit test
Moved a button to a different package. Added tests for it.