Fix for https://github.com/spulec/moto/issues/72
Need to run the whole test suite to make sure no regressions were added