separated fight and test activity