also remove where visited the $ statements in the files. They are useless, since git does not support them.
Fixed some tests, which no longer properly worked in the conditions area.

- Attempt to fix MacOSX builds