Reworked test