Tests reworked.