Test fixes?