Fixing tests and setting JSON fields lowercase