Reworked test modules