well i only gone and fixed it!
Turns out pre tensioner open circuit was a dodgy connection under the passenger seat and Drivers level 2 airbag igniter short circuit is to do with the secondary igniter on the steering wheel airbag.
all i did was unplug the secondary connector which wasn't locked in properly and refitted it.
BINGO!
Thanks for the input, just need to book the re-test and sorted!