Rename some tests
Add field_less test
Add field_more test
Style fix