Fix parse expression bug and move some test files