Refactoring to externalize tests int progress. intel compiler issues detected