Huynh/test

For piggyback API prototype