Libs moved to services
Unit tests updated