Made tipi a bit more testable