Memperbaiki unit test
Merge branch 'unit-test' into develop