Miscellaneous test fixes