Add Testing files and fix solution