Better stubbing to fix specs