get tests working with Sidney's patch
more tests