respond to comments -- remove optimizations for between classes case. Add unit test for between classes and multiple classes cases