Improved Check command and Test for check