Fix tests

Created by  Eelco Dolstra  on March 13, 2012
5SMQ2PLKIUCWCHY2LZIKI4SRZYKKMZKWZR5QSKE6ZM22HPRH54EQC
Change contents