Each test doesn't need to be in a separate file. Keep naming consistent such that relevant tests can be run together. Also skip test that do not work at the moment. No functional changes. Change-Id: Icd314d383ec5b683dea8afaaf2790e2e4b306671
