Make dictionary tests pass