Merge pull request #2581 from sebv/master

Tweaking test names and tags
enabling android tests
enabling android tests