Doesn't get stuck at test anymore