Added unittest