Working on unit tests
Remove the info response
Add more tests