@Ignore + fixed nulls in a bunch of tests.