Added new complete classes and tests