minor fixes due wrong behavior when executing tests