+ Added Unit tests and console debugging