Fix unit tests as of 20131024
Merge pull request #200 from mattaezell/unit20131024

Fix unit tests as of 20131024