Further fixing for SimpleTest functional test