Adding more test facilities