Fixed skipped tests on prod