Integration test

Integration done, please review