Add support for running tests with and without android