Fixing tests and autocreate