Some new unit tests