Change success condition, move stuff around in tests