Adding failing tests.
Fixing failing tests.