refactor treatment tests
fix issues with have_content