F# code tidy
#4137 temp ignore failing tests