Add more tests

Wrote a test, it failed, found a bug, fixed it, test succeeds!
One test is skipped, not certain yet how to write the test.