Samsung Tablets

Did this on master, not develop. Hope that's not a problem. There were 9 tests breaking already, but these additions seem to have no effect on that. Cheers.