Add more tests
Some adjustments