ISsue #505 removing gemlockfile change and fixing specs