Tag test added, filename changes etc.