Commit of refactor+tests