Fixing create and breaking tests, oh my