Fixes more errors in testing