Cleanup modinput tests & all utils