re-adjusted tests to latest changes