Fixed tests
Some fixes