Jira bugs 470, 471, 472, 473
Updated Integration tests
Updated docs