Revert to grunt for client make and test