Moved LevelList to inner class

Fixed up test cases somewhat
other small fixes.