factory battle + fixed tests