Fix smoke tests for following stuff

/cc @wheresrhys