Start of support for actual checks
More checks, including testing of advanced checks