extended common_tools module and rewritten test2 module