Fix bug on retrieve data
Add test project to the repo