Tests

Fixed some failing tests, since there were so many changes internally
the tests need to be updated.