Updated Tests to match changes
2 files changed