Implement fix for serveral of the skipped tests