DecodeJson returns Option
Cleanup tests