Fix and restore commented out tests

[ryanbrandenburg]

There are a couple of tests which have had their InlineData's commented out. Restore those and resolve any failures. At worst if we can't resolve the underlying issue at this time we can skip, which has the benefit of being easier to tell that something isn't being tested.