gradle
restructure tests for gradle