Add more fields tests