Commit f1642131d79a4854164c47ca8abb4821aa74682c

Timothy Gu 2014-02-10T03:30:50

test: more updates and fixes