get all the tests running again, fix a broken one
get all the tests running again, fix a broken one

nmsmith/Eve,nmsmith/Eve,witheve/Eve,shamrin/Eve,witheve/Eve,witheve/Eve,nmsmith/Eve,shamrin/Eve,shamrin/Eve