Cleanup due to updates on tags and B tag handling
Add tests for 'B' and 'f' tags and duplicate tags