Removed obsolete tests & config changes