Remove empty helpers
Remove empty tests