everything checks out re: unit tests. Additionally, this closes issue #112 (seriously, are we up to 112 issues already?)