WIP: change constructor in hxx file

Change-Id: Ie51f24f02f4694d126f5acf00ce20f9ebfe7dd75
WIP: test file is added

Change-Id: Ib957619cde71b566ef6e4cf7b487cf8d98174ae0