Added phase 3 test
Fixes for test infrastructure