Add unittests for PrepareOptionFiles, removal of test stages
Almost full coverage of PrepareOptionFiles.py through unit tests including resultchecking. Some changes to the test setup, including adding some utility methods. Replace usage of is in project with ==