fix related tests