Fix final bug which broke test / setup environment