Fixed some tests that were failing