Some more tests are fixes
Some more tests
Some more tests
Some more tests
Some fixes