Version with working json properly but without tests