Adding more Automation test and removing some test that are not longer usables