Fixed numeric key
Addes tests