Updated and fixed test

Merged in changed and added in a fix so that tags would get parsed properly.