updated tests closes #3 closes#7