Incremental test change from API 16 to API 19