Added some tests
merged