POD improved; minor changes in unit-tests