Added helpers tests + bugfix