Add testing stuff and tweak a few calls