Update test directory structure.

Tests can now be run using gradle connectedCheck.
Externalize the WineScraperThread.
Icon now remains transparent onResume