Add some tests, needed to improved; remove bson dep