Added a dict wrapper
added tests