Replace ACLField with proper class methods and model manager Various fixes/additions in the test field