Added some failing tests.
More failing tests. Plus some clean up.