Fix unit-test 

Separate test for each unit ( method )