Modified tests to something easier processor-wise