cleaup and tests