Completed extension migration
Added unit test stubs for amazon handler
Typehinting fix