master - updated makefiles
master - new mocked functions