Tests reworked