Added dictionary test to protect perf. improvement