Added tests for combining CompilerOptions
Updated unit tests and klr.cmd