fixing broken build
adding integration and unit tests