Updated tests to match acceptance criteria.