cosmetic
fixing and skipping buggy tests