Fixing assertion failure and InnerClass test.