improved test coverage, validated fields