Adds a window test, improves provides/requires