Switched test project over to use proper android test environment, removed some unused values to pass lint