Test fixes and inner class support