Test reformatting 3, moving tests around.  

Minimal code change, just rename test files with -specs.js at the end, and grouped tests in device specific dir.