refactored Test tube