Add test project and update solution file to vs2013
update target framework
fiddle with the regexes, and try to pinpoint the 'nothing works after a while' bug