All working with new approach
Tests with new approach