Added tests
Fixed tests