[FOLD] Improve BasicTaker to support unit test scenarios