[Dan, TMO, BSTINKY] Refactored the test