Delete redundant tests, change factories, and fix some things