Somewhat improved Mocks implementation.
Removed GetOption. Fixed mocks bug with FileSystem not being set.
Some improvements in Mocks implementation. Still way to raw to be useful.