modified patch by Elana and fixed sax tests to work with 2.1.2