Pvs/devel

- Correct test reference output
- Fix some warnings and added missing includes