More progress, need to get the call to the mock library working.
Fixed issue with mock methods not being generated as public.