Cleanup in tests

Activiti tests need refactoring and this is first phase of achieving this goal.