Build up a couple more mocks so the tests still pass. Also tighten up the type interrogation with instance_of instead of is_a