Fix unit tests as of 20131024