better testing + comments