Adding Simon Li's unit tests to our repo