Added test.
pep8
Update tablet device family.
The SCH- check was erroneously setting Galaxy S phones to tablets.