Fix unintentional change due to merge
Rename datastore api test to PascalCase
Make unit test class forward declaration to one line