#608 -- last test changes I swear.