Fixed tests to match current version. All tests pass