Fix install and update + unit test