Added additional class file parsing and expectation failure message generation