Add unit tests, where the fuck did the old ones go?