Improve testing

Improve testing