Reduced warnings

- Work on unit tests