Wrote tests and final comments