run refactored. basic tests added