Implemented computeActivity
Made test more strict