Unify skeleton and actual product tests
Add comments
Merge branch 'feature/unified_tests' into develop