fixing test and compilation failures