Subproject fixes

iirc I removed that earlier this week as this caused problems doing 'make test'. If it works now, fine. Test with BBPSDK please