Removed unused cmake directory.
Added missing reset to getopt's global variables.
Fixed missing inclusion of unit test.
Fixed code that failed in unit tests.