Add: tests
I HATE MYSELF AND I WANT TO DIE
Merge branch 'develop'