Added tests and peek method