Rewrote tests. Changelog coming.