pass vars through
organize tests into subdir