Added tests
More tests