Start rewriting unit tests properly