Insight UI test keyword fixes and script restructuring

should rearrange the scripts so that they pass under Jean-Marie's work on the build