Clean up test classes : need to be rework