Tests no longer use legacy junit assert (less warnings)
Removed unused local in cbinittests, removed unnecessary autoboxing and
use of new