TEST: fixed some failing tests