get tests to pass and run detemrinistically on my machine (mac os)
remove trailing comma
Merge pull request #1 from maxogden/test-fixes

Test fixes