TestBuilder and add to check box refactor