move new tests to assertion condition checks