Refactor scal and test_scal

Details:
- Refactor scal and test_scal
- Small refactor to existing tests