Added some missing fields methods. Better tests.