API 30 compliance

Separated test class, updated API version