Revert "More testz"

This reverts commit a76e7c1890da28fbb8f5189c804d335d109629d1.
Moar testz that shouldnt break things when merging