Tests written and passing with this patch.