Remove old, duplicate, tests