Unit tests copied over from v1, not yet working, but nothing broke so far