refactor currently testing