More test benches and some fixes