Minor fixes for lotto criteria and added updated tests