reworked tests