refactors dice, uncomments json tests