Wp 836 automated testing

Migrating automated testing for android to the new modularised code  base.