Adding better response status
Adding integration tests