Fixing circular dependencies in irbot tests