Fixed a bug in the lexer, moved some cpp programs, began work on testing cpp programs