Migrated wrapper method unit tests from original project
Cleanup warnings