Run tests on android

Run automated unit test on the android platform
Remove commented out code? (This might have got lost in a previous merge)