Move some battery api tests to comply with naming conventions.