Make installable
Tests pass