updated test + comments