moved testing build to after rebasing