simulator: fixed some tests