Comment code and create unit tests