Organize test code, more clean