Fixed some unit tests, broke others. See #14 for details.