More Tests

Hydration might have screwed up the Code