Fix some tests that were failing