Added some fakes and unit tests
XXMerge branch 'master' of https://github.com/u12206050/Andrologists2014
merged