* upgrade versions
* make test more robust