Added more parameters
Add RFC 5054 tests.