fixing broken test and compilation issue