fix & skip tests