(#32) Various updates to fix failing tests.