Added tests, but need some more testing. Ignored currently.