Enhanced methods and unit tests