Breaking out into tests into the tests and benches directories