Added a scenario intended to test whether bricks are properly deleted, final update before infomov.

Removed some redundant code, and small tweaks here and there