v0.2, improved tests