Issue 26 - Updated testing for tags.