WCM-77

WCM-77 Fix tests, organize libs