Added menu item
Writing tests
Fixed small bugs