Remove warnings
Test fixed