Add more tests for SkinFactory

Change-Id: I0a8f93abe597d6b2393f1c813e7bf76093f3ec89
Merge "Add more tests for SkinFactory"