Small modification of tests