* Add area support to vacuum service schemas * Fixed tests * De-couple platform schemas
* Consolidate final platforms * Fix some tests * Fix more tests * Fix more tests