Added tests for util
Cleaned up ButtonBar module