Fixed remaining failing body and block tests