adjusted tests due to latest changes