Small code improvement
Test cleanup: significant fields