Added some more functions
Created an adapter classes testcase, comes with an handy mock factory now, and its tests