Added several new unit tests