Tests still failing.  Changed tests