Added installation on demand and fixed grunt test