Improved lexer, got rid of unneeded test file