Fixed cause of check() failure
Fixed missing import
Fixed more check() errors