fixed a couple small issues in questionable

I was able to get the tests running again and fixed a couple issues