refactor test framwork and removing api and some extensions