Minor cleanup and removing tests we're not trying to run with Fixie