Better SLOC,LLOC and Comment count, tests