Fixed skipped tests