Improved the management if examples and tests