[WFLY-2733] - Removing unnecessary code. Adding some integration tests.