adding integration tests & integrating simulator