Added testing and changed customData handling due to changes in
stormpath