Issue 38 optimize integration tests