Includes OCMock, as well as some updated tests