Adopt test to changed system data dict