updated tests to new refactor