Adding back in some unit tests
More unit tests
Ported last unit tests