@effkay @donaier imho this should all be stubbed...