Fix: values shouldn't contains the keys!
#5 Increase test coverage of core project