Fixed more errors in tests