This closes #363
Had to split the test app from the tests, since that's how gradle forces you to do it.