Adding Functional Testing from Ying And Danny