Moving test functions into common class