fix issue though some tests are broken and need to be looked at. Many of
the broken tests are specifying behaviours that we probably want to change
not keep