[dev] Tests passing