Add test and closes #80