Updated tests to work with renamed fields