Fixed some checks so a bunch of tests no longer fail.