Another tests and fixes
Some tests