modification to tests after breaking changes (incomplete)