cleaup and tests, correct GA setup