Merge "Modified tests to account for different directories being used based on different first API levels" into pi-dev