Updated to run both test & check