Adds libraries for testing
Removes unused classes