[Issue #77][WIP] Fixed test case