adding configurations expanding integration work, refactoring test