Updates for more robust testing features
Nject updates