Fixes more errors in tests