Get tests working on v0.3