Update

Fixed missing variables, updated grunt task & tests