#16650 volume managment was messy in the tests cases, also required to change the boot-system script to support certain tests (=current_device_mount_point). The main goal was to remove some complexity from that script before adding more needed complexity again