Deleted obsolete tests and moved other tests