Few cleanups
Adding testcase for dictionary style access