Improved tests
Merge branch 'develop' into feature/betterTests
Using other branch with better test :'(
Merge pull request #5 from NodePrime/feature/betterTests

Feature/better tests, self merge boo yah