A few small tweaks to remove tools test func