Update setup to use directories for tests.

Based on the different builds (trusted/testing)