Tests are now more defined