Adding checks for fixed value fields
Fixing tests and exceptions