Tests module refactoring

Target API for tests is Conudctor Manager now.

Change-Id: I074c68bb008e35da2c27b54224d6c0cc5d120b81
Merge "Tests module refactoring"