Fixed tests, added a few more; still more tests to be added.