Fixing issue #63. Added unit tests for DPS metrics.