Melanie |#3886| Fixing SkipTests