try to kill circular dependencies
fix broken test