fix breaking tests closes #44
merge ian_branch