Only write specific GCC options to command-line: rest go in options file
More more unit test fix for spec changes