Fixed-up tests