Prettify tests
Add next and tests