More tests and fixes
All tests are now ok