getting the tests passing from jakes commit