Use new testing framework, weeeeh