Improved builder test
Fixed test cases with hardcoded filename and line number