Fix for test cases setup with new structure