Small improvements on the simple test tool