Initial work on stubbing out tests