Reverting tests for principal inclusion as they really didn't test anything worthwhile and just extra code to support.