minor tests fixes