Tests extended