Changed test defs and removed repetition