Added Android Test Suite. Refactored and moved tests to work with suite