WCM-77

WCM-77 Fix tests, remove modules and libs and organize dependencies