removed superfluous libraries and fixed some tests