More testing, Re-enabled exclude functions.