fixed up tests and autocreate