More unit tests and removed an unused library