Clean up issues in tests