Fix broken tests (closes #230)