deeper into the arena refactoring! now with unit test on Arena
removed unnecessary case handling