Minor changes
Restored the unit tests