Test Changes

Altered tests to meet new criteria.