Refactor/test

testem enabled again