Adding tests as part of patch