Fixed more issues stopping tests from passing