Fixed issue in CBD query builder. (commit: 8935591)
Get rid of ancient and unused test classes (commit: 2ddf8bb)