- Sort things out: Unittests into their own package