Removed out of date tests which somehow escaped the merge with master