Handful of test fixes