Added some tests
Test improvements