SLING-1528 Fixed, reverting to original format, and fixing the reverting the integration tests (keeping the additional integration tests to cover this area)