Readd tests that got eaten by vim copy