Tests OK to v0.6-beta