more work on main and deleted some empty elses in testdata