refactor test system - add more debug logs