Updated tests from Rene Garcia/Russell Jahn.