Added unit tests
Improved grid toolbar