refactor(tests): update test expectations and get suite passing