fix silly bug
refactor and work on tests