Integration testing (40/46)

Integration testing