Get all tests working, or delete them.
Uncomment tests that don't fail anymore.
Merge pull request #1312 from LLK/fix_more_tests

Fix tests