test(*): closes #868 closes #869 - a few unit tests