make check more comprehensive