@Ignor + fixed nulls in a bunch of tests.
Merge pull request #57 from jateeter/master

@Ignore + fixed nulls in a bunch of tests.