New tests
...
Ehh
Finished my tests
Merge branch 'master' into amazingbranch