Moving tests to zeriousify