0.9.0 added more test support