- remove tests (unused)
- converted to ARC