Fixed tests and the skeleton layout
Refactored spec for skeleton and moved it to common.spec