[nim, billy] #X fixed failing tests