PLA-308 added and changed tests, small changes for cross wiki documentation