refer to correct licence file
Removed NPE warning, extracted constant and cleaned the code a bit.
Remove unused reference to (soap) attribute map
Refactore test