With deployable version
Added a few tests