Adapted couple of tests to dict passing