Fixed broken tests (due to updated dependencies)