Added more tests
Merge branch '4.0'