Refactor test framwork, and Added Add_Binary