Update test color
Fix circular dependencies and injection problems