|#000| +RahulK | fixing, small changes in tests, DBWrapper