Worked on unit and integration tests