move evil2 into test