Fixed some unit tests that were failing