fixed some problems with the tests
replaced kwargs.update calls so that defaults don't overwrite kwargs. fixes issue #9