Improved tests, formatting and backwards compatibility for post / user term