Changed output directories to account for both source and tests