Fix addition bug, add more test cases, get rid of test.js