Removed no longer used testing schemes