Added more robust equality testing for unit tests. Unit tests pass again
Credit where credit is due