Clean up Dictionary and tests