Filed BZ's and added the decorator to the tests