added few unit and integration tests