Added POD
Added unit tests