Use correct test layer which pops demostorage after each test teardown
Better test setup for robot tests