Add pending test for bad roll
Change #roll to use new method #calculate_next_position
Fix bug in #calculate_next_position
Change all of #roll to use #calculate_next_position