separate systemcheck into module and test