updated to new refactor and test