Fix some fields annoyances. Add more complete tests.