Changes for my own selfish benefit of being able to run tests through jbuilder. Still works as expected elsewhere, dont know why it previously didnt work in JB