added unittest support