Fix some test options