fixes for skip and failed cases