Fixing a couple of spots where dependency executables were left unstubbed
Making the unstub/re-stub situation a bit cleaner/more idiomatic