Staging

WS239
Bugs and tests