Completed most of test function
Merge branch 'master' of github.com:iyw03211/pd9_PSP_PatrickT_SungwooP_PratishG