- fixed mem leak in tests
- added includes