Removing deprecated fields
Updated tests