WIP: content type testing improvments