Some updates to apply testing