#185 Improve test