Merge pull request #8 from jasonmit/master

[Testing] Tests are less fragile to timezone changes
Adding logic for shim