Refactor xinetd class to be parameterized
Fix failing spec test