Added tests.
More tests.