Added more robust stubbing validation