#582: fixed tests