Tests have been fixed and test the newly added fields