Tests are failing, circular dependency somewhere