split class commands tests
merge class commands tests