Unittesting

Fixed