rickhopkins feat: Added tests