Made tests conform to new style (without ARoom and so on)