Post Q&A Fixes

- Minor rename
- Change targetSdkVersion so it works with UnitTest tool
- Remove SupressWarning for generic type issues