Update private to private[this]
Improved tests