Add new tests, add new file-test, modify parser algorithm.