Changed test runners to use wild cards
Fixed date comparisson issues
Down to only 4 failing tests