Fix: Miscellaneous test fixes