Updated unit and integration tests before implementing code to ensure it will not break