Add more extensive sub and sup tests
Handle comma after sub/sup