Changes to test preparations and - descriptions

Lars Lundes changes