Added unittest coverage support