minor fixes + ignored two tests (required more testing)