Beefed up test-if
Removed outdated test-if file
Beefed up test-while