Fixed a test failure
Removing a wrong dependency
Merge branch 'master', remote-tracking branch 'upstream/master'
fix for discovering fiels/methods in super class