REF-138 & 143, tests for site params and re-adding problems