refactor of test build