Added Tests for Chris MetCalf and Matthew Avery