Use helpers
Update tests.