Tests cleaned up; should now be ready for links and tags migration