Changes following review + Add tests