Fix warnings and test output
Fix 2 tests