Modify Unit Test

Modify unit test into 1 file