Started adding integration and unit tests