Fixes unit tests.
Merge branch 'sbir-phase2' into 2.2i2